Add conflict with cedet, eieio, and speedbar.

Don't allow the older standalone packages to remain installed since
they break emacs23, emacs23 includes them, and they're no longer in
unstable/testing.

Thanks to Ivan Vilata i Balaguer <ivan@selidor.net> for the report.

Closes: #632142

diff --git a/debian/control b/debian/control
index 22bf71c741d4860dcb1e3fb005589eb39f10e24e..9aff25dfe6f920e9ba2cc6425cf2c4abcdadc448 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -66,7 +66,7 @@ Package: emacs23-common
 Architecture: all
 Depends: emacsen-common (>= 1.4.10), dpkg (>= 1.15.4) | install-info, ${shlibs:Depends}, ${misc:Depends}
 Suggests: emacs23-el, emacs23-common-non-dfsg
-Conflicts: emacs23-el (<< ${Source-Version})
+Conflicts: emacs23-el (<< ${Source-Version}), cedet, eieio, speedbar
 Description: The GNU Emacs editor's shared, architecture independent infrastructure
  GNU Emacs is the extensible self-documenting text editor.
  This package contains the architecture independent infrastructure

diff --git a/debian/control.in b/debian/control.in
index 9512cd59c1fd6ea0aa58f49473a6148371669017..e5b3ec55c86da79bdda9cd7987ea6626ff19d464 100644 (file)
--- a/debian/control.in
+++ b/debian/control.in
@@ -66,7 +66,7 @@ Package: @DEB_FLAVOR@-common
 Architecture: all
 Depends: emacsen-common (>= 1.4.10), dpkg (>= 1.15.4) | install-info, ${shlibs:Depends}, ${misc:Depends}
 Suggests: @DEB_FLAVOR@-el, @DEB_FLAVOR@-common-non-dfsg
-Conflicts: @DEB_FLAVOR@-el (<< ${Source-Version})
+Conflicts: @DEB_FLAVOR@-el (<< ${Source-Version}), cedet, eieio, speedbar
 Description: The GNU Emacs editor's shared, architecture independent infrastructure
  GNU Emacs is the extensible self-documenting text editor.
  This package contains the architecture independent infrastructure